Merge.
authorSteven Smith <ssmith@xensource.com>
Fri, 29 Sep 2006 14:40:35 +0000 (15:40 +0100)
committerSteven Smith <ssmith@xensource.com>
Fri, 29 Sep 2006 14:40:35 +0000 (15:40 +0100)

Trivial merge